From f72470e8bfeb86d63496f97d1e0ffcfbb7ec387d Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Thu, 8 Aug 2019 07:39:37 -0600
Subject: [PATCH] fix interaction between translation and lights. (#390)

When using a language other than English the initial painting of
the gui mainwindow showed the placeholder text for the labels next
to the waypoints, routes and tracks check boxes instead of the
lights.  This was issue #389.
---
 gui/app.qrc           |   1 +
 gui/images/lights.png | Bin 0 -> 631 bytes
 gui/mainwindow.cc     |   3 --
 gui/mainwinui.ui      |  72 ++++++++++++++++++++++++++++++++++++------
 4 files changed, 64 insertions(+), 12 deletions(-)
 create mode 100644 gui/images/lights.png

diff --git a/gui/app.qrc b/gui/app.qrc
index 947aea0f4..9e7b01996 100644
--- a/gui/app.qrc
+++ b/gui/app.qrc
@@ -4,6 +4,7 @@
      <file>images/01.png</file>
      <file>images/10.png</file>
      <file>images/11.png</file>
+     <file>images/lights.png</file>
      <file>images/open.png</file>
      <file>images/save.png</file>
      <file>images/runit.png</file>
diff --git a/gui/images/lights.png b/gui/images/lights.png
new file mode 100644
index 0000000000000000000000000000000000000000..8dc9fb2e25a626416eeec9eb840ad960c0eb4715
GIT binary patch
literal 631
zcmeAS@N?(olHy`uVBq!ia0vp^+(0bC!2%>ds`5VuQY`6?zK#qG8~eHcB(eheOiAAE
zE)4(M`_JqL@;D1TB8!2#gh7~*Vb&Z8pdfpRr>`sfV-9u!PUGh3CvP(_Fi!JyaSV~T
z%zDt)M>vt8;o<jv@B4ysUT=+&KB~4QA|WVA{IHjjq6_<Dr<k5VHuuL*PU&?{X1x1%
zrb$<xm5EQw5>>OM5B#|}D(2|we(Aq=_xa}xh7A?QwfZ)fR=%tGwQ<W0Mqaz@)~9cp
zr#yQcq#9qaeEtn4vuB6-ZQpkAmD;THjfr5BeWE-!nC0-BOG}UbTWjvg*my=%$>e0R
zVt~iPRF;;0uPq%3lNRtFZIJq<eV~Th?m1^cN2BAe3-?4e{JpbE;>wGK#hn$qKbC}f
zT8RI-EF~|~>&pAm%6|XesI#K7ycgc7xo^68I{D(>$y>cD7jK&SnPoxHZ_d**Hs;Uw
zb^R4$`Mi-$pIu6Ry?>-el}u2?#rHPvyk^vxS%|wlynIB}_L_+NzOE#P{rt<fY}{bE
ztjBi0?vZn@$|jBtQmT(MR1V$h<=iV))Lk)S#u398g1OPWg^T6>K3dqp_<zC|<3Imi
z&1`tp6gu7F#}{LlJ2#^lI1fH3%(j_m=saoN-`c0Hb$croHGjNaxi{=n@W~Hhxqqk6
ztuJTz&$xfa+--6PA6@}Qnrew_L`h0wNvc(HQ7VvPFfuT-)HSfsH82k`G_x|Wv@$i+
mH2^XU{s@HhqiD#@PsvQH#I2#%_l+@71B0ilpUXO@geCwj@BX*|

literal 0
HcmV?d00001

diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index df5d5e50d..80a6bbc62 100644
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -212,9 +212,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
 #else
   setAcceptDrops(true);
 #endif
-  ui_.wayPtLabel->setText("");
-  ui_.trackLabel->setText("");
-  ui_.routeLabel->setText("");
   lights_[0] = QPixmap::fromImage(QImage(":images/00.png").scaledToHeight(20, Qt::SmoothTransformation));
   lights_[1] = QPixmap::fromImage(QImage(":images/01.png").scaledToHeight(20, Qt::SmoothTransformation));
   lights_[2] = QPixmap::fromImage(QImage(":images/10.png").scaledToHeight(20, Qt::SmoothTransformation));
diff --git a/gui/mainwinui.ui b/gui/mainwinui.ui
index fdac6bda4..f5765e104 100644
--- a/gui/mainwinui.ui
+++ b/gui/mainwinui.ui
@@ -109,7 +109,16 @@
          </property>
          <widget class="QWidget" name="inputFilePage">
           <layout class="QHBoxLayout" name="horizontalLayout_4">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
             <number>0</number>
            </property>
            <item>
@@ -144,7 +153,16 @@
          </widget>
          <widget class="QWidget" name="inputDevicePage">
           <layout class="QVBoxLayout" name="verticalLayout_2">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
             <number>0</number>
            </property>
            <item>
@@ -221,13 +239,25 @@
        <string>Translation Options</string>
       </property>
       <layout class="QHBoxLayout" name="horizontalLayout_7">
-       <property name="margin">
+       <property name="leftMargin">
+        <number>4</number>
+       </property>
+       <property name="topMargin">
+        <number>4</number>
+       </property>
+       <property name="rightMargin">
+        <number>4</number>
+       </property>
+       <property name="bottomMargin">
         <number>4</number>
        </property>
        <item>
         <widget class="QLabel" name="wayPtLabel">
          <property name="text">
-          <string>-</string>
+          <string/>
+         </property>
+         <property name="pixmap">
+          <pixmap resource="app.qrc">:/images/lights.png</pixmap>
          </property>
          <property name="scaledContents">
           <bool>false</bool>
@@ -270,7 +300,10 @@
        <item>
         <widget class="QLabel" name="routeLabel">
          <property name="text">
-          <string>-</string>
+          <string/>
+         </property>
+         <property name="pixmap">
+          <pixmap resource="app.qrc">:/images/lights.png</pixmap>
          </property>
         </widget>
        </item>
@@ -310,7 +343,10 @@
        <item>
         <widget class="QLabel" name="trackLabel">
          <property name="text">
-          <string>-</string>
+          <string/>
+         </property>
+         <property name="pixmap">
+          <pixmap resource="app.qrc">:/images/lights.png</pixmap>
          </property>
         </widget>
        </item>
@@ -493,7 +529,16 @@
          </property>
          <widget class="QWidget" name="outputFilePage">
           <layout class="QHBoxLayout" name="horizontalLayout_9">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
             <number>0</number>
            </property>
            <item>
@@ -528,7 +573,16 @@
          </widget>
          <widget class="QWidget" name="outputDevicePage">
           <layout class="QVBoxLayout" name="verticalLayout_4">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
             <number>0</number>
            </property>
            <item>
@@ -620,7 +674,7 @@
      <x>0</x>
      <y>0</y>
      <width>675</width>
-     <height>22</height>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
-- 
2.30.2